auto merge of #628 : alexcrichton/cargo/issue-537, r=brson
authorbors <bors@rust-lang.org>
Tue, 30 Sep 2014 00:00:10 +0000 (00:00 +0000)
committerbors <bors@rust-lang.org>
Tue, 30 Sep 2014 00:00:10 +0000 (00:00 +0000)
This is rebased on https://github.com/rust-lang/cargo/pull/617 as I wanted to use one of the functions added in the patch. Otherwise the details are in the commits.


Trivial merge